From 1f1aafd5c262476b212ae6a0a4a24692129e5435 Mon Sep 17 00:00:00 2001 From: Jakub Steiner Date: Tue, 1 Feb 2022 17:12:52 +0100 Subject: [PATCH] style: legible text selections - follow adwaita styling Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/4664 --- gtk/theme/Default/_colors.scss | 1 + gtk/theme/Default/_common.scss | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gtk/theme/Default/_colors.scss b/gtk/theme/Default/_colors.scss index 07e842db75..5fae5dc4ee 100644 --- a/gtk/theme/Default/_colors.scss +++ b/gtk/theme/Default/_colors.scss @@ -9,6 +9,7 @@ $fg_color: if($variant == 'light', #2e3436, #eeeeec); $selected_fg_color: #ffffff; $selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 20%)); $selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), darken($selected_bg_color, 30%)); +$selected_text_bg_color: transparentize($selected_bg_color, 0.7); $borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color, 10%)); $alt_borders_color: if($variant == 'light', darken($bg_color, 24%), darken($bg_color, 18%)); $borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93)); diff --git a/gtk/theme/Default/_common.scss b/gtk/theme/Default/_common.scss index 5309e59855..02af5e936c 100644 --- a/gtk/theme/Default/_common.scss +++ b/gtk/theme/Default/_common.scss @@ -70,7 +70,7 @@ textview { background-color: $backdrop_selected_bg_color; &:focus-within { - background-color: $selected_bg_color; + background-color: $selected_text_bg_color; } } } @@ -161,7 +161,7 @@ label { background-color: $backdrop_selected_bg_color; color: $selected_fg_color; &:focus-within { - background-color: $selected_bg_color; + background-color: $selected_text_bg_color; } } @@ -331,8 +331,8 @@ entry { background-color: $backdrop_selected_bg_color; color: transparent; &:focus-within { - background-color: $selected_bg_color; - color: $selected_fg_color; + background-color: $selected_text_bg_color; + color: $fg_color; } } @@ -1162,7 +1162,7 @@ spinbutton { background-color: $backdrop_selected_bg_color; color: transparent; &:focus-within { - background-color: $selected_bg_color; + background-color: $selected_text_bg_color; color: $selected_fg_color; } } @@ -3390,8 +3390,8 @@ columnview row:not(:selected) cell editablelabel.editing text selection { background-color: $backdrop_selected_bg_color; color: transparent; &:focus-within { - background-color: $selected_bg_color; - color: $selected_fg_color; + background-color: $selected_text_bg_color; + color: $fg_color; } } -- 2.30.2